From 2716e3c2384de17c1a086a53142b441c31b387b5 Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 1 Apr 2013 00:29:22 +0000
Subject: [PATCH] Pass more const class arguements by refernces, a fix const
 correctness fixes, declare a few functions static to limit scope.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4374 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/bcr.cc         | 2 +-
 gpsbabel/garmin.cc      | 4 ++--
 gpsbabel/garmin_txt.cc  | 2 +-
 gpsbabel/gdb.cc         | 2 +-
 gpsbabel/geo.cc         | 6 +++---
 gpsbabel/gtm.cc         | 2 +-
 gpsbabel/lowranceusr.cc | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gpsbabel/bcr.cc b/gpsbabel/bcr.cc
index 60358a597..82d6507fc 100644
--- a/gpsbabel/bcr.cc
+++ b/gpsbabel/bcr.cc
@@ -154,7 +154,7 @@ bcr_handle_icon_str(const char* str, waypoint* wpt)
 }
 
 static const char*
-get_bcr_icon_from_icon_descr(QString icon_descr)
+get_bcr_icon_from_icon_descr(const QString& icon_descr)
 {
   const char* result = BCR_DEF_ICON;
 
diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index 51cf03c34..151dc6752 100644
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -97,7 +97,7 @@ arglist_t garmin_args[] = {
 };
 
 static const char* d103_symbol_from_icon_number(unsigned int n);
-static int d103_icon_number_from_symbol(QString s);
+static int d103_icon_number_from_symbol(const QString& s);
 
 
 static void
@@ -1272,7 +1272,7 @@ d103_symbol_from_icon_number(unsigned int n)
 }
 
 static int
-d103_icon_number_from_symbol(QString s)
+d103_icon_number_from_symbol(const QString& s)
 {
   unsigned int i;
 
diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc
index 78ad18bac..b66e6da4d 100644
--- a/gpsbabel/garmin_txt.cc
+++ b/gpsbabel/garmin_txt.cc
@@ -524,7 +524,7 @@ print_string(const char* fmt, const char* string)
 }
 
 static void
-print_string(const char* fmt, QString string)
+print_string(const char* fmt, const QString& string)
 {
   print_string(fmt, string.toUtf8().data());
 }
diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index b072101f3..562598d61 100644
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -404,7 +404,7 @@ gdb_write_cstr_list(const char* str)
 }
 
 static void
-gdb_write_cstr_list(const QString str)
+gdb_write_cstr_list(const QString& str)
 {
   return gdb_write_cstr_list(str.toAscii().data());
 }
diff --git a/gpsbabel/geo.cc b/gpsbabel/geo.cc
index d72508243..64953d9d7 100644
--- a/gpsbabel/geo.cc
+++ b/gpsbabel/geo.cc
@@ -53,16 +53,16 @@ geocache_container wpt_container(const QString&);
 
 // Compensate for most of class waypt still using C strings and needing 
 // copies anyway.
-char * ShimString(QString s) 
+char * ShimString(const QString& s) 
 {
   return xstrdup(s.toUtf8().data());
 }
-char * ShimString(QStringRef s) 
+char * ShimString(const QStringRef& s) 
 {
   return xstrdup(s.toString().toUtf8().data());
 }
 
-double ShimAttributeDouble(QXmlStreamAttributes a, QString v) 
+double ShimAttributeDouble(const QXmlStreamAttributes& a, const QString& v) 
 {
   QString rv  = a.value(v).toString();
   return rv.toDouble();
diff --git a/gpsbabel/gtm.cc b/gpsbabel/gtm.cc
index 6b500eeef..6df08b2eb 100644
--- a/gpsbabel/gtm.cc
+++ b/gpsbabel/gtm.cc
@@ -712,7 +712,7 @@ gtm_read(void)
   }
 }
 
-int icon_from_descr(QString descr)
+static int icon_from_descr(const QString& descr)
 {
   for (int i = 0; icon_descr[i]; i++) {
     if (descr.compare(icon_descr[i]) == 0) {
diff --git a/gpsbabel/lowranceusr.cc b/gpsbabel/lowranceusr.cc
index c2e835cb0..233dbe576 100644
--- a/gpsbabel/lowranceusr.cc
+++ b/gpsbabel/lowranceusr.cc
@@ -267,8 +267,8 @@ lowranceusr_find_desc_from_icon_number(const int icon)
   return "";
 }
 
-int
-lowranceusr_find_icon_number_from_desc(QString desc)
+static int
+lowranceusr_find_icon_number_from_desc(const QString& desc)
 {
   const lowranceusr_icon_mapping_t* i;
   int n;
-- 
2.30.2